cssparser: Keep track of the file

diff --git a/gtk/gtkcssparser.c b/gtk/gtkcssparser.c
index 62d911324c5f449874a2d3eb0ca485671df71cdb..7d3fa952745804b39fca27f8c19f9c5554b44738 100644 (file)
--- a/gtk/gtkcssparser.c
+++ b/gtk/gtkcssparser.c
@@ -38,26 +38,31 @@
 
 struct _GtkCssParser
 {
-  const char *data;
-  GtkCssParserErrorFunc error_func;
-  gpointer              user_data;
+  const char            *data;
+  GFile                 *file;
+  GtkCssParserErrorFunc  error_func;
+  gpointer               user_data;
 
-  const char *line_start;
-  guint line;
+  const char            *line_start;
+  guint                  line;
 };
 
 GtkCssParser *
 _gtk_css_parser_new (const char            *data,
+                     GFile                 *file,
                      GtkCssParserErrorFunc  error_func,
                      gpointer               user_data)
 {
   GtkCssParser *parser;
 
   g_return_val_if_fail (data != NULL, NULL);
+  g_return_val_if_fail (file == NULL || G_IS_FILE (file), NULL);
 
   parser = g_slice_new0 (GtkCssParser);
 
   parser->data = data;
+  if (file)
+    parser->file = g_object_ref (file);
   parser->error_func = error_func;
   parser->user_data = user_data;
 
@@ -72,6 +77,9 @@ _gtk_css_parser_free (GtkCssParser *parser)
 {
   g_return_if_fail (GTK_IS_CSS_PARSER (parser));
 
+  if (parser->file)
+    g_object_unref (parser->file);
+
   g_slice_free (GtkCssParser, parser);
 }
 

diff --git a/gtk/gtkcssparserprivate.h b/gtk/gtkcssparserprivate.h
index 2c83589682b16d6b7ff405361cb178c4e798bc43..8609531f024513225579e23e6fa2a914531eb6f6 100644 (file)
--- a/gtk/gtkcssparserprivate.h
+++ b/gtk/gtkcssparserprivate.h
@@ -30,6 +30,7 @@ typedef void (* GtkCssParserErrorFunc) (GtkCssParser *parser,
                                         gpointer      user_data);
 
 GtkCssParser *  _gtk_css_parser_new               (const char            *data,
+                                                   GFile                 *file,
                                                    GtkCssParserErrorFunc  error_func,
                                                    gpointer               user_data);
 void            _gtk_css_parser_free              (GtkCssParser          *parser);

diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 128edc3af19b5afbc5d9fa80206dfafa21f6b102..6ed7ddefc16791850af2a2880236abe72f3ac649 100644 (file)
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -1370,6 +1370,7 @@ gtk_css_scanner_new (GtkCssProvider *provider,
     }
 
   scanner->parser = _gtk_css_parser_new (text,
+                                         file,
                                          gtk_css_scanner_parser_error,
                                          scanner);